Merged.
authoremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 19 May 2006 16:31:34 +0000 (17:31 +0100)
committeremellor@leeni.uk.xensource.com <emellor@leeni.uk.xensource.com>
Fri, 19 May 2006 16:31:34 +0000 (17:31 +0100)

Trivial merge